Updating file structure and .gitignore.
Dealing with typechange.