re - organising folder structure