Organising code

Organising code