Fix merge error. Organize codebase.