Moved everything inside bottleful directory
Refactoring to accomodate new naming