Fixing Project Structure