Reorg and added build manifest stuff