getting lib organized somwhow