refactor the structure of the src folder