Refactored and renamed package structure to fit fork better.