Revert "getting rid of users labsystem and billing system"

This reverts commit bc561728fa8d5ba27acc00ed7e88dde36ae725de.