src folder restructured