module refactor

renaming modules to match shceme
More lambda