fix
renamed nb files
Simplified
Moved annotation processor to maven hierarchy