Move features to the propper folder