Changed directory structure
Updated .gitignore