Project was refactored according to your requirements.