Proper usage of the newer SQLibrary.
Clean up structure.