Updated the project organization