Remove unused variable
Give project more structure