Rename base to bitters and extract out buttons into extends folder