Initial Upload/Reorg of code

Includes contributions from Kerr_Su11, Kang_Su12, Tarquino_Su13