Rework class structure, add credit card regex