File structure adjustment, now in packages, updated npm so tests can be run using npm tests