moved dirs to new structure