Reorganise files. Reorganise usings. Add comments.