Safety commit. About to move some files for better organization.