finished updating objects, reorganized the code into smaller files.