made directory structure more clean