Added delete_safe so objects aren't necessarily deleted from the
database.  Also updated folder structure.