Reorganize bot for future development