Project globally refactored #1