lots of changes
New object structure. Think I like this one more. Seems like it will be easier to implement.
Removing old file names.