New dir structure. Updated schedule API