module structure
removed directory
Removed an old file before I begin to refactor
Merge branch 'master' into refactor