Refactored src directory structure to be mvn-like