Update to boilerplate + old files