Completely reworked the package structure for the project.