Redid the expectation system and reorganized the directory structure