more rearranging. I don't know the best file structure for this just yet