Restructured folders, commented code