Move features to top-level directory