move match into function profile
Move non-koan files into lib