reorganize directory layout a bit to be more 'normal' and use src/main/*