Major improvements in code structure