Moved files into new hierarchy