Added CommandLineParser, exceptions, fixtures and some cleanup