Restructured project and fixed collision areas