Reorganised/renamed.

The project is getting more things than just Option, so, renamed it.
Match is a very simplistic version of a match pattern, it lacks all the syntactic sugar though, so bleh.