Added option parsing - very raw version
Moved all enums to separate file
Various little changes