Refactor out extended classes into their own files