update structure of this project