Move structure
POM fixes
More progress