Organize codebase