Collision tweaks, migrated folders to provide cleaner structure.