Organization

organized some functions