major file structure changes