Support Components folder rename and restructure