Machine: Resource updates
Lots of ugly hacking: Everything in one folder