converted to a module project
removed obsolete code and comments