refactored src folder