De-catkinized and reorganized the codebase. Possibly broke all the things.