Restructured project.
Undoing commenting out code.
Removed unused imports.