finished the first stable version
reorganised the src/main/java folder