Converted Project to Maven

Add a few updates and added maven support