Moving file and fixing some issues