Updated folder structure, moved helper stuff to shared library.