Version 1.0.1 Alpha: Improved code structure.