Added missing folders with classes