Cleanup and get consts, enums, and annotation decls to output correctly
Add Struct decl output