remove unnecessary files, make it import more friendly

 Please enter the commit message for your changes. Lines starting
more clean up