FHS compliance - BREAKING COMMIT