Fixed few minor bug and renamed the main modules