EL7 support

This PR introduces besides more refactoring, EL7 support.