Refactored as a Maven Project

Refactored as a Maven Project