Refactored directory structure to remove unnecessary hierarchy.
'/src' houses the source files (without main/java)
'/test' houses tests where applicable (not under src/test/java).