Added command line option parsing
Moved files