clean code
added new modules