Updating .gitignore, modified the dir structure, refactored a little bit