Refactoring of modules + Updated gitignore files