Check-in to clean-up project structure