Moved file location around
Issue #12: renamed Rect to be extension of CGRect