Moving my some of my stuff to general src folder