Change folder structure to conform to conventions