restructuring, added new librariy refills and others
merging with old