organizing for Component System