Moved more directories around
File/host renames