moved stuff/new packaging for maven standards