Started updating project architecture