Flattened the directory structure, added more notes