Restructured directory and trying to work with Dave's mock-up.