Organized solution and added project for parser