Fixed some dependency include problems. Added app level bootstrap