Created some package structure to clean this place up.