Bugfixed project structure