intermediate commit
changed around some directories to become more maven-like