re-structured and finished the modules