cleanup and moved Mobile file
cleanup