structuring code with modules
Merge branch 'feature/structuringCodeWithModules' into dev

w