Moved some basic classes to src/main/java from src/test/java