moved around stuff into folders and made everything work