Refactor data and config class to optimize cloude storage space