Cleanup and file reorganisation