Organized libraries
Added tools into ptype