major structural changes, made it into a sane project structure