Code restructured, address label support added