Moved files into new directory structure

This omits files that will be moved by: #43