move solid stuff to own folder