Doing the last part of the restructuring + cleanup. No more restruct will happen in this iteration, focus is now on making it work...