Fix compilation issues with restructure back to Typograffiti's original.

Start refactoring to resemble existing Typograffiti structure.