Added inner classes and fixed up the decompiler representation to look
nice and work - Bibl.