Change Structure to match default maven format

This is to change to the proper structure.