Simplify Project Structure