Update structure. Continue building out pieces and integrating issues
while actually using it on local projects