Shop Organization

Some shop organization.