Initial commit of code restructuring.