Change folder structure a bit and add logic classes for Risk and BJ