restructured src folder