project struct refactor.