Refactor packages, added SQLite Database support