updated cap config and restructured file layout