Moving type and sbutype from account to application