Restructurized project, wrote some code