refactoring + add modules for my teachings