toolbar and pickers moved to separate directory