Improved organization and modularization