File and dir structure reorg for beta 3