Cleaned up dependencies and made whole project buildable with maven