Bit of cleanup/organization
Update to latest forge