Refactoring of project structure
Updated .gitignore