Fix Project Structure