Updated project for better version control