Project layout refactored + qMake trimmed