Project Structure cleanup