added some folders and fixed some bugs