Updated Project Organization

Check it out. It looks like a legit java project.