Quick clean up and organising files