Rearranged some things and created a couple of libraries
forgot to git add