cleaning up
merge with fxm-cm
few more changes after testing new structure