moved some file/dir structures around