Don't create separate common folder anymore

May be the cause of file errors?