changed directory structure
Argument parsing fixed