Updated Conventions

Changed a lot of scripts and moved all object functionality to scripts