Organise structure and use convention similar to suitcases.
Merge branch 'organize'