modularizing java project, npr cleaned up