Initial renaming pass
Removing execute bit
More namespace fixes