re-organized architecture