Moved to package in attempt to make executable jar