Returning single element shouldn't need lists.Fixing directory structure