Joined the 2 java projects into a single project