Reorganized directory layout 4/23/2013