Refactored Dictionary and Bucket interfaces into abstract base classes, folder restructures