Moved directories and files to new structure