Restructured folders, seperated design extractor module