More moving and renaming... hopefully its an improvement