restructured directories per Bill French's comment in code review