Moved files into different directory structure