Moved some common/* files into directories