Extensive re-arrangement to improve name space

Also fixed clash b/w bootstrap 2 and 3