complete refactor of the rpm structure, including directory names