Big ole commit of reorganization
More commits i guess