moved files
file move and small changes