src folder restructure
src folder restructure