refactored the folder hierachy