Re-worked project structure