Converted to Maven Project and added some minor changes