Updated structure of project to allow for packaging via maven for easy usage