Re package into Top-level dir
house cleaning
WIP pip papckage