Refactoring packages and cleaning up .classpath