Added some subfolders inside core