Reorganized Codebase