Restructured codebase.