Refactoring + add Bottle framework