Refactoring

1. Refactoring
2. Online shop
3. Bug fixes