Simplified folder structure, updated tests to use configs to match, and disabled cache since it isn't used