rearranged the directory structure. modified the python commandline utility.