Added magic game, and switched project layout