Added drop tables functionality and refactor package names