rejig file structure
rejig file structure