refactoring code, minimized it
folders as modules compliant