Rearranged some stuff and added some files