Reverted changes to project structure