modules refactor
manual update - reflecting module refactor