moved non maven specific classes to their own package as an attempt to make it more clear where the maven integration takes place