got rid of common folder