Dropped the prob directory
Made further changes to module organization