Clean up features folder structure