Revert "Normalizing CP + adding deployment assembly"

This reverts commit 9994c77a6088a621442227687ffc1f9a2a13ac95.