Added battbar dependencies and reorganized