Moved files into correct locations