making the structure of the framework more linux idiomatic