Fixing apps directory structure