Moving Libs out of src