- Move things into feature-specific files - Separate files into layers lexically - Consistently variablize modname