changed internal dir structure