Renamed main package and fixed found bug
For #tidyup