Proposal: Code + directory restructuring