move into canonical file structure