added organization folders and basic classes