Switched to Maven

Switched to Maven