[SATYR PATCH 0/2] Source code reorganization