Fix file placement after classnames refactor
Merge branch 'dev' into feature/refactor-fixtures