Lots of renaming to rationalize the organization of the code directory