big changes to directory structure