Initial import of consolidated build