Re-organised code structure Part #2