Moved classes to src/main/java for easier dependency resolution