Restructured project, improved layout and speed