Basic Collision Framework started.
Fixing deleted files?
More files cleaned up