Move directories around, be less reliant on JSON.stringify since it doesn't work on circular structures, add makefile