Restructured project to reflect package intention.