restructured source/header files + removed obsolete includes