Adjust Project Structure