Small updates, overall architecture
More small changes...
Gitignore changes, fixed stuff
...