Cleaning up base libs
Adding account and settlements models