Revised project structure (not working!)