#46: Removed a bunch of warnings and refactored the package structure.