Change Structure to match default maven format