Restructuring directory for integration of UI with codebase