Added .gitignore, minor changes to directory structure