Misc. organization changes (method visablity)