refactoring folder-structure and embadding directives
refactoring folder-structure and embadding directives