refactoring packages
adding marf library and source