Restructure + basic architecture