college: move toolbar higher
improve project organization