Some refactoring. Deleted old comments, moved files, changed maven back to 1.6 jvm