Move basic to its own folder