Initial structure changes, some code changes...