refactor moved code into modules
refactor moved resource files into modules
updated after refactoring