Made more changes. Starting a restructure.