finish code refactoring and install demo data by default