Updated solution, removed obsolote files