Manually reverted files & organized folders

After "fixing" conflicts, revert back the important files.
Organized object avoidance into a subfolder.