- Re-organized to improving the naming a bit of sub-projects