More organization (vbproj update)

More organization (vbproj update)