Updated for Maven

Fixed maven support