Refactoring src folder