Separated the objects Andy created in different files. Still need to be refined.