Changing Structure of this project