changed a bunch and renamed a lot and moving everything around