clean up package structure and extra deps