Implemented Chocolate Feast solution
Changed naming conventions on solution files