Clean up resources and their locations
Update class diagram a bit, it's not very accurate but Dia is just as hilariously terrible