src folder cleanup
src folder cleanup