Rellocate files and removed unused