Move files and improve everything