Moved files into hierarchy