Changed most of the internal require's to beans access.