reorganized dirs and changed the sys.path accordingly