package files restructure, more tests