Adjustments

Made adjustments over the summer and removed the data folder that
should be somewhere else now.