Refactoring test WIP
Moved scripts in modules
Merge pull request #2 from bowcot84/global_refactoring

Global refactoring