refactoring to prepare for restructure
Merge pull request #3 from yast/restructure2

refactoring to prepare for restructure