The Great Refactoring (Part 2) (All files now organized)